Auto merge of #3509 - froydnj:colored-shell-tests, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 6 Jan 2017 20:57:04 +0000 (20:57 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Jan 2017 20:57:04 +0000 (20:57 +0000)
disable color shell tests for terminals that don't support color

Some terminals (e.g. running a shell inside Emacs's shell-mode) don't
support color, and running tests that assume the terminal supports color
don't work so well.  Instead, if color is expected, check the terminal
for whether it supports color or not, and act accordingly.


Trivial merge